Fix $wgLogo to new location, for standard and nostalgia skins

diff --git a/config/index.php b/config/index.php
index 4a8251f..bd88567 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -709,15 +709,15 @@ if ( \$wgCommandLineMode ) {
 {$pretty}\$wgArticlePath      = \"\$wgScript/\$1\";
 {$ugly}\$wgArticlePath      = \"\$wgScript?title=\$1\";
 
-\$wgStylePath   = \"\$wgScriptPath/stylesheets\";
-\$wgStyleSheetDirectory = \"\$IP/stylesheets\";
+\$wgStylePath        = \"\$wgScriptPath/stylesheets\";
+\$wgStyleDirectory   = \"\$IP/stylesheets\";
+\$wgLogo             = \"\$wgStylePath/images/wiki.png\";
 
 \$wgUploadPath       = \"\$wgScriptPath/images\";
-\$wgUploadDirectory    = \"\$IP/images\";
-\$wgLogo                               = \"\$wgUploadPath/wiki.png\";
+\$wgUploadDirectory  = \"\$IP/images\";
 
 \$wgEmergencyContact = \"{$conf->EmergencyContact}\";
-\$wgPasswordSender     = \"{$conf->PasswordSender}\";
+\$wgPasswordSender   = \"{$conf->PasswordSender}\";
 
 \$wgDBserver         = \"{$conf->DBserver}\";
 \$wgDBname           = \"{$conf->DBname}\";

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 25636e7..8e0b269 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -34,8 +34,9 @@ $wgScript           = "{$wgScriptPath}/index.php";
 $wgRedirectScript   = "{$wgScriptPath}/redirect.php";
 
 $wgStylePath   = "{$wgScriptPath}/style";
+$wgStyleDirectory = "{$IP}/style";
 $wgStyleSheetPath = &$wgStylePath;
-$wgStyleSheetDirectory = "{$IP}/style";
+$wgStyleSheetDirectory = &$wgStyleDirectory;
 $wgArticlePath      = "{$wgScript}?title=$1";
 $wgUploadPath       = "{$wgScriptPath}/upload";
 $wgUploadDirectory     = "{$IP}/upload";